package com.xuenai.branch;

public class Application {
    public static void main(String[] args) {
        System.out.println("branch第一次提交");
        
        System.out.println("branch第四次提交,来自v3.0修改");
        

        System.out.println("branch第七次提交,来自v3.0修改,手动修改冲突");

        System.out.println("branch第六次提交,来自v3.0修改,手动修改冲突");

        System.out.println("branch第八次提交,来自master,解决冲突");
    }
}
